Skip to content

Conversation

@reddevilmidzy
Copy link
Contributor

Additional work on branch name changes

r? @Kobzol

related pr: #148564

@rustbot rustbot added A-CI Area: Our Github Actions CI A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Nov 10, 2025
@reddevilmidzy reddevilmidzy marked this pull request as ready for review November 10, 2025 12:16
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 10, 2025
@rust-log-analyzer

This comment has been minimized.

Copy link
Member

@Kobzol Kobzol left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, good catch! Left one comment, otherwise LGTM.

View changes since this review

@rust-log-analyzer

This comment has been minimized.

@reddevilmidzy reddevilmidzy changed the title Rename master branch references to main Replace 'master' branch references with 'main' Nov 10, 2025
@reddevilmidzy reddevilmidzy changed the title Replace 'master' branch references with 'main' Replace master branch references with main Nov 10, 2025
@rustbot
Copy link
Collaborator

rustbot commented Nov 10, 2025

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@Kobzol
Copy link
Member

Kobzol commented Nov 10, 2025

Thanks!

@bors r+

@bors
Copy link
Collaborator

bors commented Nov 10, 2025

📌 Commit 4eb0beb has been approved by Kobzol

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 10, 2025
bors added a commit that referenced this pull request Nov 11, 2025
Rollup of 13 pull requests

Successful merges:

 - #148694 (std: support `RwLock` and thread parking on TEEOS)
 - #148712 (Port `cfg_select!` to the new attribute parsing system)
 - #148760 (rustc_target: hide TargetOptions::vendor)
 - #148771 (IAT: Reinstate early bailout)
 - #148775 (Fix a typo in the documentation for the strict_shr function)
 - #148779 (Implement DynSend and DynSync for std::panic::Location.)
 - #148781 ([rustdoc] Remove unneeded `allow(rustc::potential_query_instability)`)
 - #148783 (add test for assoc type norm wf check)
 - #148785 (Replace `master` branch references with `main`)
 - #148791 (fix "is_closure_like" doc comment)
 - #148792 (Prefer to use file.stable_id over file.name from source map)
 - #148805 (rustc-dev-guide subtree update)
 - #148807 (Document (and test) a problem with `Clone`/`Copy` deriving.)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 3382d31 into rust-lang:main Nov 11, 2025
11 checks passed
@rustbot rustbot added this to the 1.93.0 milestone Nov 11, 2025
rust-timer added a commit that referenced this pull request Nov 11, 2025
Rollup merge of #148785 - reddevilmidzy:rename-to-main, r=Kobzol

Replace `master` branch references with `main`

Additional work on branch name changes

r? ```@Kobzol```

related pr: #148564
@reddevilmidzy reddevilmidzy deleted the rename-to-main branch November 11, 2025 17:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-CI Area: Our Github Actions CI A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants